From 95e35a136d17d2f8a4641f29e2d99227b606029b Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Fri, 6 May 2016 16:45:53 -0600 Subject: [PATCH] switch to trusty travis beta with qt 5. --- .travis.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8c5f68fbd..e7af5d8c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,12 @@ -sudo: false +sudo: true +dist: trusty language: cpp compiler: - gcc - clang +before_install: +# as a bit of a kludge remove qt4 so our configure finds qt5. + - sudo apt-get -y --purge remove qt4-qmake qt4-linguist-tools addons: apt: packages: @@ -10,6 +14,13 @@ addons: - fop - valgrind - xsltproc + - libxml2-utils + - qt5-default + - qtbase5-dev + - libqt5webkit5-dev + - qttools5-dev-tools + - qttranslations5-l10n + - libusb-dev script: - ./build_and_test # TODO: build mac -- 2.30.2